fix Qt 5.15.0 Wdeprecated-declarations warnings for (#583)
authortsteven4 <13596209+tsteven4@users.noreply.github.com>
Mon, 1 Jun 2020 11:26:31 +0000 (05:26 -0600)
committerGitHub <noreply@github.com>
Mon, 1 Jun 2020 11:26:31 +0000 (05:26 -0600)
QTime::start()
QTime::elapsed()

gui/map.cc
gui/map.h

index 5f366d33550c1d40406aa1260ed53257543dc27e..1546a6c7ed18485aade847facb5d6f6781d070eb 100644 (file)
@@ -117,11 +117,11 @@ Map::~Map()
 #ifdef DEBUG_JS_GENERATION
   if (dbgout_) {
     delete dbgout_;
-    dbgout_ = NULL;
+    dbgout_ = nullptr;
   }
   if (dbgdata_) {
     delete dbgdata_;
-    dbgdata_ = NULL;
+    dbgdata_ = nullptr;
   }
 #endif
 }
index cced27bfcc1f2e8e5c0ab012ab38abb851b5e17d..460e1c9b71bc1ee58b0ba9ebffdca042bb5cbee7 100644 (file)
--- a/gui/map.h
+++ b/gui/map.h
@@ -28,7 +28,7 @@
 #include <QWebView>
 #endif
 #include <QPlainTextEdit>
-#include <QTime>
+#include <QElapsedTimer>
 #include <QFile>
 #include <QTextStream>
 #include "gpx.h"
@@ -113,7 +113,7 @@ private:
   const Gpx& gpx_;
   bool mapPresent_;
   bool busyCursor_;
-  QTime stopWatch_;
+  QElapsedTimer stopWatch_;
   QPlainTextEdit* textEdit_;
 
   void evaluateJS(const QString& s, bool update = true);